Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 4 Feb 2010 22:04:56 +0000 (22:04 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 4 Feb 2010 22:04:56 +0000 (22:04 +0000)

Trivial merge